package PACKAGE_NAME;

public class HelloWorld {
<<<<<<< HEAD
    public static void main(String[] args) {
        System.out.println("我就等你冲突1");


        System.out.println("我有点多余 commit1231313213");
        System.out.println("我有点多余 commit222222");
    }
=======
>>>>>>> parent of 0069621 (123)
}
